From: Giovanni Campagna <gcampagn@redhat.com>
Date: Mon, 2 Sep 2013 07:59:01 +0000 (+0200)
Subject: NetworkAgent: use g_close() instead of GUnixInputStream
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~3555
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=a27b44a3c242abc79ffce490a705ef2246e8c96b;p=gnome-shell.git

NetworkAgent: use g_close() instead of GUnixInputStream

We created the input stream just to close the FD, but GLib has
a handy close() wrapper, so we can use that instead.

https://bugzilla.gnome.org/show_bug.cgi?id=707269
---

diff --git a/js/ui/components/networkAgent.js b/js/ui/components/networkAgent.js
index c83782f84..189dc942c 100644
--- a/js/ui/components/networkAgent.js
+++ b/js/ui/components/networkAgent.js
@@ -380,11 +380,7 @@ const VPNRequestHandler = new Lang.Class({
             this._childPid = pid;
             this._stdin = new Gio.UnixOutputStream({ fd: stdin, close_fd: true });
             this._stdout = new Gio.UnixInputStream({ fd: stdout, close_fd: true });
-            // We need this one too, even if don't actually care of what the process
-            // has to say on stderr, because otherwise the fd opened by g_spawn_async_with_pipes
-            // is kept open indefinitely
-            let stderrStream = new Gio.UnixInputStream({ fd: stderr, close_fd: true });
-            stderrStream.close(null);
+            GLib.close(stderr);
             this._dataStdout = new Gio.DataInputStream({ base_stream: this._stdout });
 
             if (this._newStylePlugin)